Auto merge of #1168 - alexcrichton:issue-822, r=huonw
authorbors <bors@rust-lang.org>
Wed, 14 Jan 2015 16:22:15 +0000 (16:22 +0000)
committerbors <bors@rust-lang.org>
Wed, 14 Jan 2015 16:22:15 +0000 (16:22 +0000)
Closes #822


Trivial merge